Merge "[sf] protect against out of order transactions" into udc-dev am: 69b990e3

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



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