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