[automerger skipped] Merge "Add support for API enableUiccApplications" am:...
[automerger skipped] Merge "Add support for API enableUiccApplications" am: 65056969 am: baf20e2a am: b730a0b6 -s ours
am skip reason: Change-Id I91d56beb69e5d32d927ca9c4be8eca4699bcc1a6 with SHA-1 331bda6d is in history
Change-Id: I8e72fd89d27d12a9c4ccb7536047b930572c3d37