Merge "Revert "Notify NPMS when uid becomes active or idle.""