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

Change-Id: Idc2f9786e6c5f09a8bd0f6e663c0c8f9a499a997