Merge "Use buffer to log media timeout events" into tm-dev am: 6037653177 am: e66d028cf3 am: bfbb01ebd7 am: bf4ca74b14

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

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