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