Merge "[automerger] Merge "aw: Loosen criteria in testGetContentHeight()" into nougat-cts-dev am: e6a1bc94c2 am: 358119aad5 am: 1f55893ae8 am: a9d73390c6 am: f8bb0cdd98 am: 8528a60a44 am: 5b2d095ef4 am: e7fed94eb7" into oc-mr1-dev
am: 8ab6e01023

Change-Id: I2c91db89f4851efa7c3732908f2f829771458443