Merge "Merge "Prevent double-applying transactions" into tm-qpr-dev am:...

Merge "Merge "Prevent double-applying transactions" into tm-qpr-dev am: dbdc3922" into tm-qpr-dev-plus-aosp am: b698e1f4

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



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