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