Merge "Put change type below closing type for a close transition" into udc-dev...

Merge "Put change type below closing type for a close transition" into udc-dev am: 6aecb91b am: c0c07e51 am: 688a6193

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



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