Merge "Revert "Update agents to support UI separation"" am: 0dec4e3c53 am: ad3c0ca12f am: 3e2ce8498b am: 45a12150da

Original change: https://android-review.googlesource.com/c/platform/hardware/google/aemu/+/2549534

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