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

[automerger skipped] Merge "Zero-initialize CursorWindow buffer" into tm-dev am: 100f534d am: b7628a5c -s ours am: fb2010c0 -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/+/32332741



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