[automerger skipped] Merge changes from topic "Delete RcsMessage code" am: 32f87fc6fb am: c1ff7279d0 -s ours
am skip reason: Change-Id Icebabc4d16c2e6d5b6e2fb311fee697e8acfa285 with SHA-1 113d4543ad is in history
Change-Id: I91599a938d8a2239b7fbf6a99ddab1c4270e1958
This commit is contained in: