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

Merge "Add bug fixes in vendor classes" into rvc-dev am: cb65e857 am: 53bc428e am: 760bc140 am: 8c254774

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

Change-Id: I941fb7fb8df448b9deebaa50de4bd461d90ddc6b