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

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

Change-Id: I735fbe031bef57ecb7a4e0428bcd56484a9af116