Merge "[MS29] Remove Trace hidden API dependencies" am: be70a4353a am: 56da05be6c am: e987d6eb82

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

Change-Id: I34899dff6aa29ef5940afce89d459d2585d97044