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