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

Merge "Make mExpandImmediate false when collapsing" into udc-dev am: f3825fa7 am: 70008f2b am: 3d9ad60d am: 42184061

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



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