Merge "Add permission whitelist for EmergencyInfo app." am: 3fb7c4740e
am: bd96a65d1c

Change-Id: Ie8a16b9a210ffe4bc03ccc4a722210eff14992d2