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

Change-Id: I526b0d9b4c77ffcf144788317ff78ec431c97405