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

Change-Id: I5fe7aefb42087ed577d67b9677915d1392d7ef9e