[automerger skipped] Merge "Remove the public APIs for allow rich content." into rvc-dev am: 2ebe60b5df am: 32f03587a1 am: d7368f2757 am: 53e28f2f66 -s ours
am skip reason: Change-Id I4f734a496938f64bcde990268e11a2d1a5be4771 with SHA-1 a2f7f84938 is in history
Change-Id: I5137681b95ce4528fee157a329a2418f8b0239d8
This commit is contained in: