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