[automerger skipped] Merge "Fix IC vts bugs and add tests for IC...
[automerger skipped] Merge "Fix IC vts bugs and add tests for IC IWritableIdentityCredential.aidl interface." into rvc-dev am: c9490155 -s ours
am skip reason: Change-Id I51902681776c6230e49589fc75a8145e79d7d1a6 with SHA-1 92b61d65 is in history
Change-Id: Ie13db6ddaed7567d32cc116fb7e6e506dd3f1321