Merge "Merge TQ1A.230205.002" am: 0a9affaaab am: 016f304b8d

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

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