Merge "Merge "Fix testGetContentHeight for low density case" into...
Merge "Merge "Fix testGetContentHeight for low density case" into nougat-cts-dev am: b728c32b" into nougat-mr1-cts-dev
am: 09e9b717
Change-Id: I7749fccfb5d2217a7d4208622bfd64c219d2032c