Merge "Fix multi-display nav bar tests on large screen devices" into...

Merge "Fix multi-display nav bar tests on large screen devices" into tm-qpr-dev am: cfaad7ff am: e38b3413

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



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