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: 7171f5e2

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



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