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

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



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