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