Merge "Wait for dispatcher idle before asserting policy callbacks" into...

Merge "Wait for dispatcher idle before asserting policy callbacks" into udc-qpr-dev am: 11512800 am: c42bc2bd

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



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