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