Merge "Consolidate animation to show divider bar" into tm-dev am: 56043e3d am: 1d0a63f6

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



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