[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 749948c22b -s ours am: 7a48964232 -s ours

am skip reason: Merged-In I16b18111bc9806e9cc7b8d31b72e30f12905c99d with SHA-1 3f94be0573 is already in history

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

Change-Id: Ic3293ad56e4262e79f21304cdc91d29f80d1f181
Signed-off-by: Automerger Merge Worker <[email protected]>
tree: 84a7e8ddbd6b747b86295d6c26ce375ba3cc3b14
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. build.gradle
  6. OWNERS