Merge "Don't whitelist all system image apps." into pi-dev
am: 3fbc54e609

Change-Id: I6eef88e7080c8c599494448b640ba0284cb30f6d