[automerger skipped] Merge "Guarantee transitions always update occlude...

[automerger skipped] Merge "Guarantee transitions always update occlude status" into tm-qpr-dev am: cb924c50 am: d0942d97 -s ours am: 1275c83c -s ours

am skip reason: Merged-In I00dd31606ed08b67666a58f1b3e2f0f3b31fcaa6 with SHA-1 7da8adaf is already in history

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



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