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

Change-Id: Id4df504d0c5a4622605b4803e8b3f2cb49003156