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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3bc46833ea281b13ab4013a65e5e6f24e9d76ff9