Merge "Drop sync buffers for subsequent sync requests" into tm-qpr-dev am:...

Merge "Drop sync buffers for subsequent sync requests" into tm-qpr-dev am: 813c1e83 am: 290a8afc

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



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