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