Merge "[Ongoing Call] Don't show the ongoing call chip when there's a HUN."...

Merge "[Ongoing Call] Don't show the ongoing call chip when there's a HUN." into tm-qpr-dev am: e186eb93

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



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