[automerger skipped] Merge "Merge Android 12L" am: 406cb943c8 -s ours am: bed4ab7204 -s ours am: c40829f8ba -s ours am: d0cf14f332 -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: If916779704ba40a44d8ac7e3fbbd891590f3b64d
tree: 8483d99f93552bc19cf774b8339725ba47d070ff
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. build.gradle
  6. OWNERS