[automerger skipped] Merge "Refresh embedded subscriptions on user unlock."...

[automerger skipped] Merge "Refresh embedded subscriptions on user unlock." am: 56bd87a3 am: 1abdc3d6 am: 683970cc -s ours am: b20b0418 -s ours

am skip reason: Merged-In I818a8b78ae48f95d29fd0dc354726739c4232c06 with SHA-1 c9b6fd9f is already in history

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



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