Change layout to address failing portability tests. am: aa62b6cb40 am: 3a499b7c5e am: fa8ef9a368 am: 80e5b642bb

Original change: https://android-review.googlesource.com/c/platform/system/teeui/+/1329356

Change-Id: I8f8e5ee355b2145a4b91378d180d8d352103b1da