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

Change-Id: I2cfc893f8e636790a837e0f71f9f42ea723c8e31