[conflict] Merge "PackageWatchdog: fix the double close issue." into main am:...

[conflict] Merge "PackageWatchdog: fix the double close issue." into main am: 39ef4727 am: 3bf2a519

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



Change-Id: If90d5eb46dc6e57bad1cbc6a3c3637c5af272b91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Flag: EXEMPT cherry pick
Test: TH
Bug: none