Merge "Merge "Merge "Merge "aw: Fix testGetContentHeight() CTS test" into nougat-cts-dev am: 99e5260f39" into nougat-mr1-cts-dev am: eadbaf3009" into oreo-cts-dev am: 546aa28560" into oreo-mr1-cts-dev