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

Change-Id: I631f5c67a09d5dc466f6200392ca3528589e16ad