Merge "Introduce a whitelist for core apps used by system server." am: 679727afeb am: 3293557187 am: 2a678b0f02  -s ours
am: 0581d8f12d

Change-Id: Ide0b0351ad3d1dafbb77a35570650deeda517d6d