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