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

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

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