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