Merge changes from topic "am-bd02cec51a7c47dda2adc777e3666a7c" into tm-qpr-dev-plus-aosp am: 53a2e0586e

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/19135049

Change-Id: I932d1f55124d428fbcf73d113580b6e6866e2b68
Signed-off-by: Automerger Merge Worker <[email protected]>