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