Merge "Relax strictness of mocks in DisplayLayoutTests" into tm-qpr-dev am: ff95cd095c

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

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