[automerger skipped] Merge "Merge "Fine-tune the public APIs of allow rich...

[automerger skipped] Merge "Merge "Fine-tune the public APIs of allow rich content in Accessibility Settings for security." into rvc-dev am: 9c9ed396 am: 647d514d" into rvc-d1-dev-plus-aosp am: 13ac192d -s ours
am skip reason: Change-Id I8ecad186fc9e4bb6799ded296805cdc5353c5010 with SHA-1 193da543 is in history

Change-Id: If496063802dc4d5903a86c440d9267c33415134a