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