Merge "Allow only selected priv apps to run OOB" into pi-dev
am: 792d36c170

Change-Id: Iad80a321e1b76f19935a23290594a36fd057840c