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

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



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