Merge "Merge "Fix testGetWindowVisibleDisplayFrame in multiwindow mode" into nougat-mr1-cts-dev am: 71dbc69b83 am: 3002a3a9f3 am: fd559e9a1f am: 0c6ff1d4a1" into nyc-mr2-dev-plus-aosp
am: 4b831c2469

Change-Id: Ib24d523ffb7298016569c39c6ea85b38aa5d42e4