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

Change-Id: Ib2efa8d7d72933aa44bf18f9aacbead841545918