Merge "Correctly log buffer unfreeze events" into udc-dev am: 1acffcbe am: 7d7025f3

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



Change-Id: I0d9f716ec5770b498a7b00da9d7614ef12479e3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>