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