Merge "Check bg persistent-app policy against base uid, not nominal"