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