Merge "Improve openscreen logs" into main am: e788a158c8 am: ff36197630

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

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