Merge "base: remove onBind and onMessage from TraceReport API surface" am: b27a57a7b6 am: 47f0797eb0

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1991971

Change-Id: I9b8625f684a3cb120d1d8cb4f15b39332424eb14