Merge "Merge "Remove dead stub occlude/unocclude animators" into udc-dev am:...

Merge "Merge "Remove dead stub occlude/unocclude animators" into udc-dev am: 3c0f9d66 am: 4669edd6" into udc-d1-dev-plus-aosp am: d79231d3

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



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