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