Merge "Add permission whitelist for EmergencyInfo app." into pi-dev