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

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

Change-Id: I79d4aadfc73b8db1364de08db3509237838729b6