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