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: Id260c5db67161a76d8cfe38f074e6d96aac9c4f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>