[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 7d30431d06 -s ours am: c99ffa3510 -s ours

am skip reason: Merged-In Ia4a67fa56ba34af9c212c8986e4d76b1ebeb9694 with SHA-1 39584c847c is already in history

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

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