[automerger skipped] Merge Android 12 am: f369d20de1 -s ours am: 10e2ec4377 -s ours

am skip reason: Merged-In I623d78b62308dec895c0fa15f38fedfc47d7013a with SHA-1 7d30431d06 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1847255

Change-Id: I68e2f069aa8794e421f2b7ed66370109132e5b45
tree: b24321ac17884be632351c22f458e3f75ece2aa2
  1. rcs/
  2. METADATA
  3. OWNERS