Merge "trusty: Increase size of ACVP shared memory" am: b963ff97

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2192875



Change-Id: I8a504567739a20e1fd82c531045c33a4b7d9830f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>