Revert^2 "Update agents to support UI separation"" am: f053c9850a am: 1bb16a2547 am: e4c530fc21

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

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