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