tree f77909dc1cd16ddad1233e9f3c7756aedc508265
parent 1d0c4478c8119342d29cbed25d887792fb7bab37
parent c90196973d52402c4f2abd005cbf97c33084d50d
author android-build-prod (mdb) <android-build-team-robot@google.com> 1525825678 -0700
committer android-build-merger <android-build-merger@google.com> 1525825678 -0700

[automerger skipped] Merge "Remove disableBackgroundScheduling" am: a0685c87c8
am: c90196973d  -s ours

Change-Id: I1e6df5eb96c4e9f77c2dd00be93f9a30ea4a6838