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