Merge "Merge "DO NOT MERGE: Use getWindowVisibleDisplayFrame to get display height" into nougat-mr1-cts-dev am: fd2074ea8d  -s ours"