[automerger skipped] Merge "Remove the public APIs for allow rich content."...

[automerger skipped] Merge "Remove the public APIs for allow rich content." into rvc-dev am: 2ebe60b5 am: b84b8d15 -s ours am: 870c7fee -s ours am: 07883740 -s ours
am skip reason: Change-Id I4f734a496938f64bcde990268e11a2d1a5be4771 with SHA-1 01a592bf is in history

Change-Id: I3ac64c019d5faa969f779479a49b9f295111114b