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

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

Change-Id: Ib16541a2680990408c209264a3816ad6c0f77702