[automerger skipped] Merge "Fine-tune the public APIs of allow rich content in Accessibility Settings for security." into rvc-dev am: 9c9ed396b5 am: 3e48115eb7 am: 9c0e132a0e am: c0b4427aac -s ours
am skip reason: Change-Id I8ecad186fc9e4bb6799ded296805cdc5353c5010 with SHA-1 c6e3836915 is in history
Change-Id: I22456f5865f1f3bef3f3e999c2b495d28bc3d350
This commit is contained in: