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

Merge "[automerger skipped] [automerger] AdapterService: Check the PIN code length before using am: 49d81fa7 am: cf44ae92 am: 79a820b8 am: ac0783d8 am: 71056e2c am: a65d3a4b -s ours am: fb94ebba -s ours am: 79238b3e -s ours am: cdcc4e72 -s ours
am: 9bb887bb -s ours
am skip reason: change_id Ie2dd01e0b192e7ed1fe4b464618ddfa415dbf15c with SHA1 1feb4d24 is in history

Change-Id: I0798f700449b239ae68b18f417b2312111318852