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