[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: 3e48115e" into rvc-d1-dev-plus-aosp am: 16e4d39e -s ours
am skip reason: Change-Id I8ecad186fc9e4bb6799ded296805cdc5353c5010 with SHA-1 193da543 is in history

Change-Id: Ief6ca6e0a0e8075a0c252367fd4e64aeeada6a2a