Merge "Merge "Fix calculation of the collapsible height" into rvc-dev am:...
Merge "Merge "Fix calculation of the collapsible height" into rvc-dev am: 5cb264d9 am: 0d9c6a8f" into rvc-d1-dev-plus-aosp am: a68d2cfc
Change-Id: I192726ee2576e26ca1f9bb38b712ff04c292b9d1