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