[automerger skipped] DO NOT MERGE: AdapterService: Check the PIN code length before using
am: 3d7549de50 -s ours
am skip reason: subject contains skip directive

Change-Id: I9e6843b8ede6c0c6ef053f1630a23ed8eef0473d