[automerger skipped] Fix testNetworkScanRequestParcel_Parcel CTS am: c834e855cb am: afc22b32d0 am: 775c3bc788 -s ours
am skip reason: Change-Id Iad7d91d8813415bbd2f3b6cad02120e59441e08a with SHA-1 8dcbd6474b is in history

Change-Id: I1f89ab0f595cc5971fbd051a0f8770bb161d383a