[automerger skipped] Merge "[VCN20.1] Change requestBackgroundNetwork argument...

[automerger skipped] Merge "[VCN20.1] Change requestBackgroundNetwork argument order" am: 0ef9f63b am: 04dd1160 am: ad1d4d7b -s ours am: d7981f67 -s ours

am skip reason: skip tag Change-Id I0c4bfd9feee5460a8594663b0e24eeb6f3301c0b with SHA-1 6678d356 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1676251

Change-Id: Ifb59b732774cdee77910f8dea5265191159530bd