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