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