[automerger skipped] Merge "[Ongoing Call] Make the uidObserver a val so that we're guaranteed to not accidentally register it multiple times in a row." into tm-dev am: 9c7fdd7efa am: 15bc821a4d -s ours
am skip reason: Merged-In I8073f178566754037e25af57d2b9949f0d6a396d with SHA-1 4c910f625a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16988928
Change-Id: Ie579988ecfe69c099a7628676b2de2ecd1bea120
This commit is contained in: