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 am: 2fcd3fe8
Change-Id: Id106df1674513faf26627b29a21dc97ecc4621be