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

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



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