Merge "Wait after putting a display to sleep in ApfIntegrationTest in Automotive Multi Display configuration instead of polling for interactiveness" into main am: b4a2a5a1ce

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3322318

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