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

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



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