[automerger skipped] Merge "PackageWatchdog: ensure the opend resources are eventually closed" into main am: f5202a60 am: 676cdff4 -s ours

am skip reason: skipped by ancr

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



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