Merge "Use PackageManager query instead of permissions review mode booleans." into cw-f-dev