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