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: afb4d36c -s ours am: 10ce98a9 -s ours am skip reason: change_id Ie2dd01e0b192e7ed1fe4b464618ddfa415dbf15c with SHA1 1feb4d24 is in history" into qt-qpr1-dev-plus-aosp