[automerger skipped] Merge RQ2A.210305.007 am: 2c948b21c7 -s ours am: 62e8f5425b -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: Ib3381e70f3828d23087d4c00802daab338581581