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

Change-Id: I1ffd7a84eb0e5be9259538042c0680b54ab7c29a