Merge "trusty: Update TIPC UAPI header" am: 00e57e0841 am: 074e3c233e

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

Change-Id: I686a7d3d33c9aa18d33144f5a1e546715084f570