am 23b4310c: am 8dc44abd: Merge "Use smaller display size for secondary display test. (DO NOT MERGE)" into lmp-mr1-dev

* commit '23b4310c01afc54ce4000f761669085c3092c763':
  Use smaller display size for secondary display test. (DO NOT MERGE)