Merge "Merge "Merge "Merge "Merge "Fix testGetContentHeight for low density...
Merge "Merge "Merge "Merge "Merge "Fix testGetContentHeight for low density case" into nougat-cts-dev am: b728c32b" into nougat-mr1-cts-dev am: 09e9b717" into oreo-cts-dev am: 4a2f159b" into oreo-mr1-cts-dev am: fde5832d" into pie-cts-dev