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

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

Change-Id: I5e6d9917b9979506c3d75e4923437c7b1e2b46d0