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

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



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