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