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