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