Merge "Fix testNetworkScanRequestParcel_Parcel CTS"