Merge "Add bug fixes in vendor classes" into rvc-dev am: cb65e857 am: c60c4917 am: a10175d2

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

Change-Id: I5a99bebddae28802d73d65ba13a9a61221c40f82