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