Merge changes from topic "sync-dsrm-and-proto-to-tm-qpr-dev" into tm-qpr-dev am: d5009ae8

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



Change-Id: I08270ce54006bbd982495ca1c6f8b4b1733279cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>