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