[automerger skipped] Merge "Add "emergency calling" warning when WFC doesn't support emergency calls." am: e7d1f2e4cd
am: 0d7ece753f  -s ours

Change-Id: I19e76124d5f6291c5260b7ebac65e4703baae14f