Merge "Revert^2 "Fix NPEs in {AppId,Package}AppOpPolicy"" into main