Merge "Fix un-dismissable incoming call for auto-rejected calls" am: dd27d93ad6

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1443535

Change-Id: I3b107906f635f2591804120dc75d763d20c03c1c