[automerger skipped] Added addSubInfo support am: 5aed8aec am: 97d54377...

[automerger skipped] Added addSubInfo support am: 5aed8aec am: 97d54377 am: abcc76c2 -s ours am: 5f9b8c87 -s ours am: f369227f -s ours

am skip reason: Merged-In I1e494f9229e2b8d0b9e21aa56c69008e13d1ff7b with SHA-1 363f99b5 is already in history

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



Change-Id: I5f257f9b5a8fbdc82ea46260b8719b483d5825a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>