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

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

Change-Id: Ie66e267bf9774c5f973f71c0489db1fa14333d57