[automerger skipped] default hidl CryptoPlugin: security fixes [RESTRICT AUTOMERGE] am: d22f1447fe am: 756f134fcc am: f6e7c9ed25 -s ours am: fe72b76df1 -s ours
am: 5cfbc4ba16

Change-Id: I73333d50cf52fd9e9a2a429587d78ebc85dd82fe