Merge "Guarantee transitions always update occlude status" into udc-dev am:...

Merge "Guarantee transitions always update occlude status" into udc-dev am: c39455c2 am: edec5a9a

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



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