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