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

[automerger skipped] Merge "Zero-initialize CursorWindow buffer" into tm-dev am: 100f534d am: d6cbe5be -s ours am: f2816c29 -s ours am: 202f6529 -s ours

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

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



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