[automerger skipped] Merge "Query embedded subscriptions after user unlock"...

[automerger skipped] Merge "Query embedded subscriptions after user unlock" am: 9e2172fd am: 4d7880ce am: a5cec3bd -s ours am: 76235552 -s ours

am skip reason: Merged-In If6b4685f3453f0cdcdf61f5d32a45740af28587f with SHA-1 8f5c8641 is already in history

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



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