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: 856ed31c

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

Change-Id: Icb9b700eaa5d144d161b20e0fa951655fcdec17e