For top layout use FrameLayout than GlifLayout

In these xml files we are having nested GlifLayout, that I think
messes up the UI

Bug: 237169259
Test: Manual
Change-Id: I9df8b1b7b5c19c61b92b30432bc7d78325876425
(cherry picked from commit 3dcf68f321f4111c69f21853c7aa49b53d48bcb0)
Merged-In: I9df8b1b7b5c19c61b92b30432bc7d78325876425
2 files changed