[automerger skipped] default hidl CryptoPlugin: security fixes [RESTRICT AUTOMERGE] am: d22f1447fe am: 756f134fcc am: f6e7c9ed25 -s ours
am: fe72b76df1 -s ours
am skip reason: subject contains skip directive

Change-Id: I29ffdf3a7520a251d28502514f1f5b1ba44520ae