[automerger skipped] Merge "Fix un-dismissable incoming call for auto-rejected...

[automerger skipped] Merge "Fix un-dismissable incoming call for auto-rejected calls" am: dd27d93a am: 98da2d69 am: c7101dbe -s ours am: 7fa09db3 -s ours

am skip reason: Change-Id I054e6b00656fc04f48f7f378076e29322daf59ad with SHA-1 f1f2e040 is in history

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

Change-Id: Ia4b07c2ff86931446a6493ccbbcff7752c657af2