Merge "Update the expanded view height when bar is stashed" into udc-qpr-dev...

Merge "Update the expanded view height when bar is stashed" into udc-qpr-dev am: b7a861a4 am: d93d8c3a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24012908



Change-Id: I64cd2293360a6533e10918948e41b0f409f13cda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>