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