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