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