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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3bc46833ea281b13ab4013a65e5e6f24e9d76ff9
tree: f67e78d99137609ed27f240d150f109b8494ba56
  1. core/
  2. services/
  3. tests/
  4. OWNERS