Merge "Handle ringback changes between call state changes." into sc-dev am: 632f4e1a am: 5fd55f78

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/15029523

Change-Id: I4b9a709a9547e58ec70a9e8a67836e80c1e38dfa