Merge "[Media] Add some tracing to media classes." into tm-dev am: ee1b4d02...

Merge "[Media] Add some tracing to media classes." into tm-dev am: ee1b4d02 am: 7d2be046 am: 1204b8d9

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



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