[automerger skipped] Merge "Add 'hasKnownUserIntentEmergency' into ImsCallProfile Parcel" am: 9102b10a am: bd50159b
am: 089b1427 -s ours
am skip reason: change_id Ie68a02a7e0f9aabe5dbc37806a495169feb63765 with SHA1 0c86fbf4 is in history
Change-Id: Ia1e1663617cb14c2374f9c560211fca24d77302a