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 am: 183fb8ea am: b8b8fcdd

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

Change-Id: Ic02fc7f8ff507e2da5fc25fd5808ecac3fe54ed3