Merge changes from topic "telephony-background-cb" am: f3a83b6c9c am: 365c6b6687 am: 0a247cb555

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

Change-Id: Id6a1712a1522ea767c93d423fd95d35bf5ab9cac