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