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