[automerger skipped] Merge "Add Call Composer Tuple in RcsContactPresenceTuple class" am: 45a397a84a am: f9bdfcccc4 am: d26b0ed704 -s ours
am skip reason: Change-Id Id1c3eaf11d85ec5df3c253443bafdb18fd31ccce with SHA-1 111e80214e is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542210
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0eab13913abbcbf272db3c9f73986988bd7e70b6
This commit is contained in: