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