Merge "Merge "Merge "Merge "aw: Loosen criteria in testGetContentHeight()" into nougat-cts-dev am: e6a1bc94c2" into nougat-mr1-cts-dev am: 42cbcd4740" into oreo-cts-dev am: b23a72e12e" into oreo-mr1-cts-dev am: e6fdd70549 am: e1ae1bf528
am: bfe93ce6ba

Change-Id: I39c8585a94fa55095615847da161ee328fa78604