This is the change to merge btw: https://codereview.chromium.org/2790703002/

Merge approved for M58 branch 3029.

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

commit 9266031a6c59f20cdab0e500ecc742a31695548a
Author: Khushal <khushalsagar@google.com>
Date: Fri Mar 31 21:30:50 2017

cache_invalidation: Restrict background services only on O.

Starting/Stoping the invalidation client requires starting a service
which should be gated on O builds only. Since the current check uses
isGreaterThanN, which is still true for certain N builds, use
isGreaterThanO instead.

BUG= 706956 

Review-Url: https://codereview.chromium.org/2790703002
Cr-Commit-Position: refs/heads/master@{#460864}
(cherry picked from commit faa4d68dd2fec796031ce483ef8aed4929bef34c)

Review-Url: https://codereview.chromium.org/2792683002 .
Cr-Commit-Position: refs/branch-heads/3029@{#519}
Cr-Branched-From: 939b32ee5ba05c396eef3fd992822fcca9a2e262-refs/heads/master@{#454471}

[modify] https://crrev.com/9266031a6c59f20cdab0e500ecc742a31695548a/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java
[modify] https://crrev.com/9266031a6c59f20cdab0e500ecc742a31695548a/components/invalidation/impl/android/java/src/org/chromium/components/invalidation/InvalidationClientService.java
[modify] https://crrev.com/9266031a6c59f20cdab0e500ecc742a31695548a/components/invalidation/impl/android/java/src/org/chromium/components/invalidation/InvalidationService.java

Thanks for the quick fix Khushal!

 Issue 707799  has been merged into this issue.