[automerger skipped] Merge "Cleanup vendor class files" into sc-dev am:...

[automerger skipped] Merge "Cleanup vendor class files" into sc-dev am: c3950397 am: 21933691 -s ours am: 0ec8b54e -s ours

am skip reason: Merged-In I7eb2b64d02244056be79853e412eb83635cb6371 with SHA-1 d7b2f59c is already in history

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

Change-Id: Id8f85e39820c263ec9971fbaea7b19e3e4c5236d