[automerger skipped] Merge "Guarantee transitions always update occlude status" into tm-qpr-dev am: cb924c504d am: d0942d9790 -s ours
am skip reason: Merged-In I00dd31606ed08b67666a58f1b3e2f0f3b31fcaa6 with SHA-1 7da8adaf3d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21798206
Change-Id: I4a02e1986009974a6f5e972be58501007413777a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: