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