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

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



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