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