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