commit a4c1adafe8c388144df888ca89b1a85601918264
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed May 06 03:24:32 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 06 03:24:32 2020 +0000
tree 1026a08bb4c4dddb4cc1d42f4832a60062b7042e
parent b0b48b07ec60c705477d24bca4f54e5a5d245ba8
parent a9c48809b35b7349192d3f6998a46f8bc8ca2c04

Merge changes from topic "am-ce3313c2b8da49d9b34e7d44a98b2d63" into rvc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge changes from topic "am-99b870448c8c43b2815c42861ac6235c-rvc-dev" into rvc-dev am: df554bb5f8 am: 47285473fe am: 501fdb008b -s ours
  [automerger skipped] [SP18.5] Create offload controller poll interval to resource am: 2a5f21425a am: f887f54a5c am: e456c439dd -s ours
  [automerger skipped] [SP18.4] Add unit test for polling network stats in OffloadController am: 14722baf0d am: b6ab822c32 am: 16bf484526 -s ours
  [automerger skipped] [SP18.3] Adapt TestableNetworkStatsProviderCbBinder am: b7011d2265 am: 8c23b65a4f am: e3fa9fdd05 -s ours