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: a094ab21 am: ddd7c2ab am: 1c116bf0

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



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