[automerger skipped] Merge "DO NOT MERGE Fix divider animation from overview screen" into sc-v2-dev am: af13b2e957 am: 2b819ff553 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I16d2f17700ccf614e42ae5e3074efb2393a317b0