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

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



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