Merge "Fix test when running on large screen devices" into sc-v2-dev am: 9ff10b86 am: 27cd93e6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15472904

Change-Id: Ida129b93785f7f8122ba1e95f55b5ae243f48ac1