[automerger skipped] Zero-initialize CursorWindow buffer am: c87118a5 -s...

[automerger skipped] Zero-initialize CursorWindow buffer am: c87118a5 -s ours am: cfad8fa1 -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: I5291053bebdb64d42633987e74d027f00a82a0e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>