tree 1b219b0c704af8cc474afd71e4bd1164a361a316
parent f2d491e4fa47afcf7c374ad1247c2f68e5f9301c
parent 3a65eb77da316bb290352a1327f4cdd4d9962eba
author Robert Shih <robertshih@google.com> 1568263755 -0700
committer android-build-merger <android-build-merger@google.com> 1568263755 -0700

[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