[automerger skipped] Merge "Populate 'hasKnownUserIntentEmergency' in RIL...
[automerger skipped] Merge "Populate 'hasKnownUserIntentEmergency' in RIL framework" am: 534f9a52 am: 3f2e12c8
am: b712013e -s ours
am skip reason: change_id I153d5bf1951bc162183bee77357ec6d6f92d0704 with SHA1 61237ed5 is in history
Change-Id: Id94b40da7c9dad50842eb2a71f78da6ea0e26de9