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

This reverts commit b0ed625c7243a01675e0764383c43f9863ed7f91.

Reason for revert: Not culprit for b/25925437

Change-Id: Ibd95037e0b0f795b1c56aa0e71d644921ae16f79
2 files changed