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