Merge "Trampoline atrace definitions through libbinder to libcutils" am: e812abddc0 am: 039cd688c1 am: c60e32d52c am: 5f49ce9ca2

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2189867

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