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: 5c3c9765

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



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