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

Change-Id: I0e2e6fa93a4f15023f17efba275c236880863ccd