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: d206204b

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



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