Merge "Add debug logging for media view events" into tm-dev am: db41a61d am:...

Merge "Add debug logging for media view events" into tm-dev am: db41a61d am: 681369e2 am: 9738c6ee

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



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