[automerger skipped] Merge "Make getAllUiccCardInfos return info from inactive...
[automerger skipped] Merge "Make getAllUiccCardInfos return info from inactive slots" am: 5666628f
am: 1b175806 -s ours
am skip reason: change_id Id351c4e4b31ed9a6bb488953179e79bdbbf1efed with SHA1 296f1c67 is in history
Change-Id: I7645e47dce1cd27d10277a08be08446233eb5c95