Merge requested for 
https://chromium-review.googlesource.com/c/chromium/src/+/631137

For some reason the commit bot didn't a comment.

This bug requires manual review: We are only 11 days from stable.
Please contact the milestone owner if you have questions.
Owners: amineer@(Android), cmasso@(iOS), ketakid@(ChromeOS), govind@(Desktop)

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot

Approving merge to M61 Chrome OS.

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/1cf11d497e7b052f4dcfbae1959b4bdaae0551ed

commit 1cf11d497e7b052f4dcfbae1959b4bdaae0551ed
Author: Tim Song <tengs@chromium.org>
Date: Thu Aug 24 22:58:15 2017

[EasyUnlock] Fix EasyUnlock not initializing on boot from power off.

Because the Bluetooth adapter is not immediately initialized after boot, this
edge case was causing EasyUnlock to fail to load.

There was also some unintuitive lock screen behaviour that caused the
first focused user to be unset.

BUG= 758415 
TBR=tengs@chromium.org

(cherry picked from commit 9fd93b0de71b01ef99bad0d95ac789804871697d)

Change-Id: If98e0acc3d944f2508d84a5c8241a907778462f5
Reviewed-on: https://chromium-review.googlesource.com/631137
Commit-Queue: Tim Song <tengs@chromium.org>
Reviewed-by: Gustavo Sacomoto <sacomoto@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#497114}
Reviewed-on: https://chromium-review.googlesource.com/634333
Reviewed-by: Tim Song <tengs@chromium.org>
Cr-Commit-Position: refs/branch-heads/3163@{#867}
Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
[modify] https://crrev.com/1cf11d497e7b052f4dcfbae1959b4bdaae0551ed/chrome/browser/signin/easy_unlock_service_signin_chromeos.cc
[modify] https://crrev.com/1cf11d497e7b052f4dcfbae1959b4bdaae0551ed/components/proximity_auth/proximity_auth_system_unittest.cc
[modify] https://crrev.com/1cf11d497e7b052f4dcfbae1959b4bdaae0551ed/components/proximity_auth/screenlock_bridge.cc