Merge "Fix testGetContentHeight for low density case" into nougat-cts-dev