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

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



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