Merge "Do not add divider to dismiss transition" into udc-dev am: eee7c251...

Merge "Do not add divider to dismiss transition" into udc-dev am: eee7c251 am: ef033149 am: 4f38d3bc am: 7b099a6f

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



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