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

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



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