bottleservice: Make initial device directory matching more strict

Change-Id: I8607cbd2b96515d41e890fd9421fe64dddaa5eb9
Merge remote-tracking branch 'upstream/kk44' into kk44