Merge "Use buffer to log media timeout events" into tm-dev am: 60376531 am:...

Merge "Use buffer to log media timeout events" into tm-dev am: 60376531 am: c08f4296 am: 725b0047 am: 86598d89

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



Change-Id: I132f814e9942aebf016d2d4ad436dc581e980d0f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>