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

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



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