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