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

Change-Id: I686b33bdae0835f374bc24213ccdfbe4b089877f