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