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

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

Change-Id: I441fa0446d213d2ef95b214cfd66c8a260758d57