Merge "Skip merging non-ready transition" into udc-dev am: 57e90d8f am: e5ff6b75

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



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