[automerger skipped] Merge "Add bug fixes in vendor classes" am: 8ebe81a2...

[automerger skipped] Merge "Add bug fixes in vendor classes" am: 8ebe81a2 am: 5a56e160 -s ours am: 22ea5b20 -s ours am: e2f9725f -s ours am: 50c73234 -s ours

am skip reason: Change-Id I8790f4f4f2062a5e15d1a1195f3129c07c7a09b4 with SHA-1 8306e3b3 is in history

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

Change-Id: Ia07d0e6d62fb7c1309aae01ba3a0b067b027f462