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