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