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