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