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