Merge "Merge "Merge "Merge "Fix testGetContentHeight for low density case" into nougat-cts-dev am: b728c32b9e" into nougat-mr1-cts-dev am: 09e9b71758" into oreo-cts-dev am: 4a2f159bb8" into oreo-mr1-cts-dev
am: fde5832d5f

Change-Id: I14ac0348c8a36464bb6dc80d92487ce7618d4ad8