Merge "Ignore carrier apps when checking for idleness" into mnc-dev