Merge "Don't apply transactions of abort out-of-order." into udc-dev am: bb726e9c

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



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