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