Merge "Move EmergencyInfo perm whitelist to /product" am: ae957afaa6
am: 300026a5e9

Change-Id: Ia932307a9b85366daa8e8ec09dd92a124ea1d8cf