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