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

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

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



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