Merge "Fix testDeclareNetworkRequestUnfulfillable on R" am: 09d97085d0 am: 679ec299a9

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519790

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I78e997f44d00ee99ca4212bd9b1b72d12dfc8e4f
tree: 66ba969d4e11782e9412b4d18bb0f6ebdcc36d02
  1. core/
  2. services/
  3. tests/
  4. OWNERS