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