[automerger skipped] Merge "Add REQUEST_NOT_SUPPORTED for pin and pin2 Icc VTS" am: c417c54960  -s ours
am: 6e69011e4c  -s ours

Change-Id: I3f2f6fe765e97c20b2eec4e23adff11043c82f99