[automerger skipped] DO NOT MERGE: AdapterService: Check the PIN code length before using am: 3d7549de50 -s ours am: ff2350273b
am: 331521b8fb

Change-Id: I20ebe2fcadbf38ee7d9471f38905eb8ca098860d