[automerger skipped] Merge "Fix a bug where the subtype is not initialized...

[automerger skipped] Merge "Fix a bug where the subtype is not initialized correctly" am: e6e6fe9e am: 8f2fac4e -s ours am: fe3fa9ef -s ours am: c1de69af -s ours

am skip reason: Change-Id I397d773ac9bb5532d72036d3cb3d37e52c79ee4e with SHA-1 7403bd54 is in history

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

Change-Id: I2aa60fb9189ab9df64186618b4c96188a2e66fda