[automerger skipped] Merge "Fix createLaunchEmergencyDialerIntent API behavior when Telecom unavailable." am: 419c0fa22e am: e3051550fd -s ours am: 52bf8ea08e -s ours am: 1c0e198f55 -s ours
am skip reason: Change-Id I1665d456dace8e41cc035e792f319d98dd07219c with SHA-1 28ba067389 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392010
Change-Id: Ic771f845fe62064e19ca3bfa12697ee8a2dd89f4
This commit is contained in: