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

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



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