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