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 am: e39845c3

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



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