Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950673 Change-Id: Id2c1fa8af2948da18269e729f32613bb33b23c0f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>