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

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

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