[automerger skipped] [DSRM] Fix issues am: f9f165a6 am: c5800069 -s ours...

[automerger skipped] [DSRM] Fix issues am: f9f165a6 am: c5800069 -s ours am: 89acf228 -s ours am: 1e4623b4 -s ours

am skip reason: Merged-In Ia6f2ed58f73fa4d96b8bafee8bd22933a99926dd with SHA-1 827a7c1b is already in history

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



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