Merge "[Ongoing Call] Always unregister the UidObserver." into sc-dev am: 3d1c180320

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

Change-Id: I111b9537b05bf785c9f32917c1835bdd24964412