Merge "Make sure VRI waits for SV to draw before report" into tm-dev am: 4c2c7ebfaa

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

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