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