Merge "Add package failure flags to Package Watchdog" into qt-qpr1-dev-plus-aosp