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

[automerger skipped] Merge "Zero-initialize CursorWindow buffer" into udc-qpr-dev am: 2135373c -s ours

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

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



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