The following revision refers to this bug:
  https://chromium.googlesource.com/catapult/+/ef39ebad87f7a9a77c685a896e337d8f3231aeb4

commit ef39ebad87f7a9a77c685a896e337d8f3231aeb4
Author: bsheedy <bsheedy@chromium.org>
Date: Thu Sep 20 18:02:37 2018

Add force commit to SharedPrefs

Adds the optional force_commit argument to SharedPrefs' Commit method,
which allows the caller to bypass SharedPrefs' automatic no-op if the
stored prefs are not dirty.

The use case for this is restoring modified preferences at a later time,
where the SharedPrefs' contents are not dirty, but the file on the
device has been changed by something else.

Bug:  chromium:887579 
Change-Id: I058a05e0746b46f8c6e68f1269ceecfaa21bd398
Reviewed-on: https://chromium-review.googlesource.com/1236916
Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>

[modify] https://crrev.com/ef39ebad87f7a9a77c685a896e337d8f3231aeb4/devil/devil/android/sdk/shared_prefs.py
[modify] https://crrev.com/ef39ebad87f7a9a77c685a896e337d8f3231aeb4/devil/devil/android/sdk/shared_prefs_test.py

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

commit 9b1f3b4495dcf5f3cff94427b2fc2d455091ab01
Author: chromium-autoroll <chromium-autoroll@skia-public.iam.gserviceaccount.com>
Date: Thu Sep 20 21:45:28 2018

Roll src/third_party/catapult 3d81f7cc222b..b0768af22643 (3 commits)

https://chromium.googlesource.com/catapult.git/+log/3d81f7cc222b..b0768af22643


git log 3d81f7cc222b..b0768af22643 --date=short --no-merges --format='%ad %ae %s'
2018-09-20 benjhayden@chromium.org Fix /api/report/template
2018-09-20 bsheedy@chromium.org Add force commit to SharedPrefs
2018-09-20 wangge@google.com Add function to run benchmark both locally and on swarming.


Created with:
  gclient setdep -r src/third_party/catapult@b0768af22643

The AutoRoll server is located here: https://autoroll.skia.org/r/catapult-autoroll

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.

CQ_INCLUDE_TRYBOTS=luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel

BUG= chromium:887579 , chromium:863390 
TBR=sullivan@chromium.org

Change-Id: I0052555ff9d1cd652448e2b3af79e37681de72e0
Reviewed-on: https://chromium-review.googlesource.com/1236883
Reviewed-by: chromium-autoroll <chromium-autoroll@skia-public.iam.gserviceaccount.com>
Commit-Queue: chromium-autoroll <chromium-autoroll@skia-public.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#592956}
[modify] https://crrev.com/9b1f3b4495dcf5f3cff94427b2fc2d455091ab01/DEPS

Forgot to add the bug to it before getting committed, but https://chromium-review.googlesource.com/c/chromium/src/+/1220557 fixes this.