[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
am: 3a65eb77da

Change-Id: Ic94ed9a6380f5b42bd881977b5136d839e8ed1ba