Merge "Fix some places where we could abort an already-requested transition"...

Merge "Fix some places where we could abort an already-requested transition" into udc-dev am: b3634daf am: e734d354

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



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