Merge "Re-enable use of isPrivilegedApp()" am: bd51de1b20
am: a5a493cc19

Change-Id: I633d8e838d559056a331bc81bd5db5f644fa4489