[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: 8afe496239
am: d98e70a042 -s ours
am skip reason: subject contains skip directive

Change-Id: If94f68abdc99f8aab732321c8f56e2340bdf1a7c