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