[automerger skipped] Merge "Zero-initialize CursorWindow buffer" into...

[automerger skipped] Merge "Zero-initialize CursorWindow buffer" into tm-qpr-dev am: fc4c8539 -s ours am: afb01094 -s ours am: 80ab6c5d -s ours am: bb62c4ff -s ours

am skip reason: Merged-In I755240b0e3ba185c01036a5e00c8785d2e1ac11a with SHA-1 c07e0eba is already in history

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



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