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

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

Change-Id: Idb601ea0f49f0a027f54e41dfa139c6589b89987