[automerger skipped] Merge "Filter downloaded carrier keys for msim" am:...

[automerger skipped] Merge "Filter downloaded carrier keys for msim" am: a1a64639 am: 1dc7c6da am: cac13294 -s ours am: e4b6d581 -s ours

am skip reason: Merged-In Iaa426d174a6b1601daa80a6bfc207e1f17d848c8 with SHA-1 a398ad96 is already in history

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

Change-Id: I5f9cdc05e71fbe853f3c0a666dc86cc909d56e93