Merge "Filter downloaded carrier keys for msim" into sc-dev am: b45d0b27 am:...

Merge "Filter downloaded carrier keys for msim" into sc-dev am: b45d0b27 am: 6f387326 am: f5fb4e94

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

Change-Id: Iab83aebe316c14344abe49dda21117a01aaaed4f