[automerger skipped] Merge "[DO NOT MERGE] Remove UNOCCLUSION_TRANSITION flag"...

[automerger skipped] Merge "[DO NOT MERGE] Remove UNOCCLUSION_TRANSITION flag" into tm-qpr-dev am: 9f3a3500 am: a9d06ef6 -s ours am: 11d7f7d8 -s ours

am skip reason: subject contains skip directive

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



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