aml_per_341711000 (11515803,com.google.android.go.permission,com.google.android.permission,com.google.android.permissioncontroller)
Revert^2 "Update agents to support UI separation"" am: f053c9850a am: 1bb16a2547 am: e4c530fc21 am: c1257c34e2

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

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