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