Merge "CROSS_SIM: Use extras to trigger update to properties" am: c3417c25c3 am: 7ea0ff2754

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/2072134

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