Merge "Fix testDeclareNetworkRequestUnfulfillable on R" am: 4d90f237f2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifbd7dafd1b5b2387f64991d7d8c41b62c7a97e3f