[automerger skipped] Merge "Added isActiveSubId support" am: 8e1f2ed9 am:...

[automerger skipped] Merge "Added isActiveSubId support" am: 8e1f2ed9 am: d03c6c26 am: 748e9ffb -s ours

am skip reason: Merged-In I369dd7a0f60952d9fef5265f4779a98df97f7da3 with SHA-1 009cd96e is already in history

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



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