[automerger skipped] Merge "Make sure connection requests are rejected if a...
[automerger skipped] Merge "Make sure connection requests are rejected if a device is PRIORITY_OFF" am: d001d672
am: a7686394 -s ours
am skip reason: change_id I235888e284e7fcc023101b99d0306ad3f4f17fbf with SHA1 a0fd735a is in history
Change-Id: I551945ff0ea364233afa7021463dc5aca6cf9e96