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

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



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