Merge "[automerger] Merge "Merge "Fix testGetContentHeight for low density case" into nougat-cts-dev am: b728c32b9e" into nougat-mr1-cts-dev am: 09e9b71758 am: 1471ab940b am: 57a5038178 am: 5aa7299a45 am: b11ce3a743 am: ce17d4b219" into oc-mr1-dev