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