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