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