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