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 am: e2fdb9f5

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



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