Merge "Update BorderAnimator to work with layout updates" into udc-dev am: b323851e01 am: 56ae9055d6

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23320817

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