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

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

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