[automerger skipped] Fix cursor leaks into IPMS database am: e213e2236f am: bb65d68914 am: 9c384e1308 -s ours

am skip reason: Change-Id Ic4e0d8b1c8483b4e254bca95d2bf30e5ed203b23 with SHA-1 e213e2236f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11882388

Change-Id: Ia3875876a1724bdc589d41838a08a49113b00abb