Merge "Re-enable use of isPrivilegedApp()" am: bd51de1b20 am: a5a493cc19 am: 3a6b550753
am: 154eca93e7

Change-Id: Ie8793108595b128a8ec898b4cada98c98a93fb1c