[automerger skipped] Merge "Merge TQ2A.230405.003" am: fd8670a4 am:...

[automerger skipped] Merge "Merge TQ2A.230405.003" am: fd8670a4 am: 5d93cea1 -s ours am: 2f055749 -s ours am: d1267c16 -s ours am: 35f746da -s ours

am skip reason: skipped by user delphij

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



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