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

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



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