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