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