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

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



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