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