[automerger skipped] Merge "Add prefix to create correct enterprise OsAppId"...

[automerger skipped] Merge "Add prefix to create correct enterprise OsAppId" am: 94f68114 am: 9fcaa0f4 -s ours am: 2bc92254 -s ours am: 6b8afc6c -s ours

am skip reason: Merged-In I30493810519f63f4e06000203c2ee19367dde373 with SHA-1 14b7039c is already in history

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

Change-Id: I3477fbd150e2677498cdc4af7c3a7084c8d0e485