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 am: 73c0196fdf
am: fbadf10db9

Change-Id: I1ed8f9222fd9ecbcf623352789c2e1831cd162b9