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