Merge "Trampoline atrace definitions through libbinder to libcutils" am:...

Merge "Trampoline atrace definitions through libbinder to libcutils" am: e812abdd am: 039cd688 am: c60e32d5

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



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