New layout tests added in https://android-git.corp.google.com/g/70926 Change-Id: I3c12f44d2c283e8b1da1c10975d6e4dd567889f8