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