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

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

Change-Id: I16d744757e26f3cfb0a06ca3f618874dfc221bd4