Merge "Add Location APPs to allow-in-power-save whitelist"