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