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

Change-Id: Ic83ce8ebc2e4b8fa1950189921024eeca967d0c9