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