Merge "[DSRM] Fix issues" into tm-dev am: e25fe694

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



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