Merge "Merge "Save AsyncOps for later forwarding instead of SyncOps." into...

Merge "Merge "Save AsyncOps for later forwarding instead of SyncOps." into rvc-dev am: 7ec25249 am: 4b94dff3" into rvc-d1-dev-plus-aosp am: 6e89bb13

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

Change-Id: If87c626b824466cbb9dccd229a193a3529980679