[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix CryptoPlugin use after...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability." into oc-mr1-dev am: c73a5227 -s ours am: 583a32b6 -s ours am: 79754b8d -s ours am: ea107f75 -s ours am: ea7913ad -s ours am: 814a3400 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13497596

Change-Id: I306dbee8ccfd47f98b6526766bf62913d4d627c2