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