Merge "Merge "Make mExpandImmediate false when collapsing" into udc-dev am:...

Merge "Merge "Make mExpandImmediate false when collapsing" into udc-dev am: f3825fa7 am: 93a9ece9" into udc-d1-dev-plus-aosp am: a04a4cd6

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



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