Merge "Replace MonitoredPackage#STATE_ constants with IntDef"