Merge "Allow registered call notifications to always appear" into tm-dev am:...

Merge "Allow registered call notifications to always appear" into tm-dev am: f8e0fd5f am: 53d093f1

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



Change-Id: I0f6d7aa45b1fd5f7a3f89dbab4f5d4951be0d5ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>