Merge "Fix un-dismissable incoming call for auto-rejected calls" into rvc-qpr-dev am: 0c52a7600f am: c2dd3604c9

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

Change-Id: I04a9fc16338dd676a7adb71a3d1471d815af2c75