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