Merge "Fix a bug where the subtype is not initialized correctly" into rvc-dev...

Merge "Fix a bug where the subtype is not initialized correctly" into rvc-dev am: 7844460d am: 20552c46 am: 519e6cae am: 5b27def6

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

Change-Id: I76913cefe40c8e4d1a0e2b8162ce9154402bd6db