[automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: 25fdacad -s...

[automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: 25fdacad -s ours am: a3ca7b04 -s ours am: 39dd57ee -s ours

am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc8 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2130212



Change-Id: Ibe201c915c050cd35cd4fa3aa45c10f35c8ad431
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>