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: 76e7d2c9

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

Change-Id: Ia569b5f89fbc241fa78808602bde9e90103a7c43