[automerger skipped] Merge "For top layout use FrameLayout than GlifLayout"...

[automerger skipped] Merge "For top layout use FrameLayout than GlifLayout" into tm-qpr-dev am: 8f839acd am: ec8ad87f -s ours

am skip reason: Merged-In I9df8b1b7b5c19c61b92b30432bc7d78325876425 with SHA-1 3dcf68f3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20979439



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