[automerger skipped] Merge "Merge Android 12" am: be0207c133 -s ours am: 461f8840e6 -s ours am: e012838cad -s ours

am skip reason: Merged-In If9c1662ef79e1df216df3f49809eda6c383278ca with SHA-1 3c8d3ac2d3 is already in history

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

Change-Id: Ibc51857bd481ce35e849d8a680e29cd356bd880a