Merge "Merge "Refactor PackageWatchdog explicit health checks" into qt-dev am: e0283ded" into qt-dev-plus-aosp