Merge "[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" into qt-qpr1-dev-plus-aosp
am: 562e4f15b5 -s ours
am skip reason: subject contains skip directive

Change-Id: I69020a812baac1b89309ce2c9cfe5734be9cb22e