Merge "Merge "ViewRootImpl/SurfaceView: Listen for queue stalls" into tm-dev...

Merge "Merge "ViewRootImpl/SurfaceView: Listen for queue stalls" into tm-dev am: 7a0ee72b am: f3712255 am: dda57ab1" into tm-qpr-dev-plus-aosp am: 9264da75

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



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