[automerger skipped] Merge "Fixed internal service state exposed to clients"...

[automerger skipped] Merge "Fixed internal service state exposed to clients" am: 1ad04fc9 am: 74d41538 am: 7958681d am: 7447b2b7 am: c8aed806 -s ours

am skip reason: Merged-In I08311c01a841fee70f82a0a1809a8e13829447ce with SHA-1 91af5cac is already in history

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

Change-Id: Ia894ba6155dc4176dce70ad6fff9c2dd39c18bf9