[automerger skipped] Merge Android 12L am: 1c4f37de31 -s ours am: 94a6930749 -s ours am: 8332f4a617 -s ours

am skip reason: Merged-In I6cb6a8b4df1001a4d72880c9f2d661c26387fc03 with SHA-1 85613df1c3 is already in history

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

Change-Id: I9f6cca551203772c25791cd5fb24642d5a09d2cd
tree: 84a7e8ddbd6b747b86295d6c26ce375ba3cc3b14
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. build.gradle
  6. OWNERS