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

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

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



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