Merge "Add permission whitelist for EmergencyInfo app." into pi-dev
am: 1417d6c543

Change-Id: I6edbde2c8cc7628703b45492d006f5c97485a083