Merge "Merge "Respect parent bounds if it can contain the override bounds"...
Merge "Merge "Respect parent bounds if it can contain the override bounds" into rvc-dev am: 0e42093c am: 9c42dd45" into rvc-d1-dev-plus-aosp am: 3659375d
Change-Id: I8990bd3223725bd5dcc0337ad846fafde71225d1