fix PA Preferences derps and add Apollo to Extra Product Packages

Change-Id: I75eb12dea9c490ae773fa40d8b5f29e30c5a793e