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