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