[automerger skipped] Fix cursor leaks into IPMS database am: e213e223 am:...

[automerger skipped] Fix cursor leaks into IPMS database am: e213e223 am: bb65d689 am: 9c384e13 -s ours am: e35f1da9 -s ours

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

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

Change-Id: I7d92aa5dc1bf931cfa142f9094659b275a89002b