Merge "[automerger skipped] [automerger] AdapterService: Check the PIN code...

Merge "[automerger skipped] [automerger] AdapterService: Check the PIN code length before using am: da3422f1 am: cc149f7f am: bfae1bfa am: 48079454 am: 0244b8e7 am: 03189bb6 -s ours am: eb28cfbf -s ours am: ce349826 -s ours am: 5bfef914 -s ours
am: fc993e5e -s ours
am skip reason: change_id Ie2dd01e0b192e7ed1fe4b464618ddfa415dbf15c with SHA1 d6c84aa3 is in history

Change-Id: I0798f700449b239ae68b18f417b2312111318852