Merge "Introduce a whitelist for core apps used by system server." am: 679727afeb
am: 3293557187

Change-Id: Iba143d70f5900d9ae6e4fb8205fc3a538e4a8283