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

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

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



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