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

Change-Id: I6cfd776fd1014f15191ebc7ebfb6a444c6c40cd5