[automerger skipped] Merge "Re-apply uicc application enabled setting if modem...
[automerger skipped] Merge "Re-apply uicc application enabled setting if modem is out of sync." am: 8bf56e9e am: b3124d1d am: 9a303fc5 -s ours
am skip reason: Change-Id Ib6f8687a43482af07f945fd970386039c0c6f6f8 with SHA-1 44328ee5 is in history
Change-Id: Iff6aedaac3ab6626d99386cdde441139e8a647dd