Merge "cros: Update ash when prefs related to lock are changed"

Merge "cros: Update ash when prefs related to lock are changed"

> BUG=670423
> TEST=SessionControllerClientTest.UserPrefsChange
>
> Review-Url: https://codereview.chromium.org/2873453003
> Cr-Commit-Position: refs/heads/master@{#470368}
> (cherry picked from commit 33f44a4a580cff9bbfc7f2125f33602f5bbb99c5)

https: //chromium-review.googlesource.com/478055
https: //codereview.chromium.org/2832903002/
Review-Url: https://codereview.chromium.org/2878723002 .
Cr-Commit-Position: refs/branch-heads/3071@{#514}
Cr-Branched-From: a106f0abbf69dad349d4aaf4bcc4f5d376dd2377-refs/heads/master@{#464641}
Committed: https://chromium.googlesource.com/chromium/src/+/ef4589a2e06253ca91eff0b88ad52c11bf2ce896

[xiyuan, 2017-05-11 17:29:37]

Description was changed from

==========
Merge "cros: Update ash when prefs related to lock are changed"

> BUG=670423
> TEST=SessionControllerClientTest.UserPrefsChange
>
> Review-Url: https://codereview.chromium.org/2873453003
> Cr-Commit-Position: refs/heads/master@{#470368}
> (cherry picked from commit 33f44a4a580cff9bbfc7f2125f33602f5bbb99c5)

Note this is a manual merge and included part of:
  https://chromium-review.googlesource.com/478055
  https://codereview.chromium.org/2832903002/
==========

to

==========
Merge "cros: Update ash when prefs related to lock are changed"

> BUG=670423
> TEST=SessionControllerClientTest.UserPrefsChange
>
> Review-Url: https://codereview.chromium.org/2873453003
> Cr-Commit-Position: refs/heads/master@{#470368}
> (cherry picked from commit 33f44a4a580cff9bbfc7f2125f33602f5bbb99c5)

Note this is a manual merge and includes part of:
  https://chromium-review.googlesource.com/478055
  https://codereview.chromium.org/2832903002/
==========

[xiyuan, 2017-05-11 17:30:31]

Description was changed from

==========
Merge "cros: Update ash when prefs related to lock are changed"

> BUG=670423
> TEST=SessionControllerClientTest.UserPrefsChange
>
> Review-Url: https://codereview.chromium.org/2873453003
> Cr-Commit-Position: refs/heads/master@{#470368}
> (cherry picked from commit 33f44a4a580cff9bbfc7f2125f33602f5bbb99c5)

Note this is a manual merge and includes part of:
  https://chromium-review.googlesource.com/478055
  https://codereview.chromium.org/2832903002/
==========

to

==========
Merge "cros: Update ash when prefs related to lock are changed"

> BUG=670423
> TEST=SessionControllerClientTest.UserPrefsChange
>
> Review-Url: https://codereview.chromium.org/2873453003
> Cr-Commit-Position: refs/heads/master@{#470368}
> (cherry picked from commit 33f44a4a580cff9bbfc7f2125f33602f5bbb99c5)

https: //chromium-review.googlesource.com/478055
https: //codereview.chromium.org/2832903002/
Review-Url: https://codereview.chromium.org/2878723002 .
Cr-Commit-Position: refs/branch-heads/3071@{#514}
Cr-Branched-From:
a106f0abbf69dad349d4aaf4bcc4f5d376dd2377-refs/heads/master@{#464641}
Committed:
https://chromium.googlesource.com/chromium/src/+/ef4589a2e06253ca91eff0b88ad5...
==========

[xiyuan, 2017-05-11 17:30:32]

Committed patchset #1 (id:1) manually as
ef4589a2e06253ca91eff0b88ad52c11bf2ce896.