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

Change-Id: I3e41058a76b840dfcd1b5171b8c6688509f1fd7d