Revert "Fix NPEs in {AppId,Package}AppOpPolicy"

Revert submission 25925437

Reason for revert: Probable culprit for b/320815151. Will be running through ABTD for confirming and before submitting the revert.

Reverted changes: /q/submissionid:25925437

Change-Id: Iac30c12eb0ef7b3e9e9db5fc27c128398dd92d81
2 files changed