[automerger skipped] Merge "Do not assert CardState::PRESENT on sim power...

[automerger skipped] Merge "Do not assert CardState::PRESENT on sim power down" am: b311ffdb am: 43d81bfc am: 0bdb66ad am: 6c86b611 -s ours am: 16a873bf -s ours

am skip reason: Merged-In I6c9cbad7cd4fd19eb0b77c55ff37298b97f32050 with SHA-1 f7069c65 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1869544

Change-Id: I0d24367b59c415403e2188fae3944cc8e7a47ec8