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