[automerger skipped] Merge RQ2A.210305.007 am: 2c948b21c7 -s ours

am skip reason: Change-Id I4287696a57a49282ae5ae08c5581553d7ccb2373 with SHA-1 ffab734014 is in history

Original change: https://android-review.googlesource.com/c/device/google/bonito-sepolicy/+/1613621

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I313d8f385a92f25c20e0fd3de70b0d45dc9f19b7