[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "sync-dsrm-and-proto-to-tm-qpr-dev" into tm-qpr-dev am: d5009ae8 am: c78499c9 -s ours am: d34f09a2 -s ours am: 5bfc3b4a -s ours

am skip reason: Merged-In Ia33e05eadc2e96a1b2b78c488af4efcb9811065e with SHA-1 ccb767c8 is already in history

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



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