Merge changes from topic "phone-call-indicators" into rvc-qpr-dev am: ff2866cfd6 am: a592f49c5b

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

Change-Id: I8c6413133542605e73d249c54e86e64635b49e2b