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: c60c4917 am: a10175d2 am: 1038c66c

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

Change-Id: Iae94668e08edbd9d30258c14185b047e533de7b4