[automerger skipped] Merge "Client side implementation of Trusty IRPC HAL" am: 8fe56020 am: b3cae813 -s ours am: 6f131ea4 -s ours

am skip reason: Merged-In I32c30ce2dc44e95ff91574ce405f10e3b5dc9699 with SHA-1 5ac2c87c is already in history

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

Change-Id: I1b3ae75723cb1a6e7d5fb5e9e8ac6f13774ae6c2