Merge "Guarantee transitions always update occlude status" into tm-qpr-dev am: cb924c50

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



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