Merge "Fix a bug where the subtype is not initialized correctly" into rvc-dev am: 7844460d9e am: 76e7d2c9d0

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

Change-Id: I87e97b585045d06710322f2deae06bcb1880e432