Merge "Merge "Fix testGetContentHeight for low density case" into nougat-cts-dev am: b728c32b9e" into nougat-mr1-cts-dev