Merge "Fix testDeclareNetworkRequestUnfulfillable on R" am: 4d90f237f2 am: ed548e8e02

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I78e997f44d00ee99ca4212bd9b1b72d12dfc8e4f