replace FrameLayout with merge tag am: cc02cb9a7e am: 94cee247c5

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3093762

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