Merge "CursorWindow_test: fix leaks" am: b3a175ac am: f8b09c78 am: 0f42146d

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



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